(no commit message)
authorMark A. Hershberger <mah@everybody.org>
Tue, 22 Jun 2010 16:57:20 +0000 (12:57 -0400)
committerMark A. Hershberger <mah@everybody.org>
Tue, 22 Jun 2010 16:57:20 +0000 (12:57 -0400)

Trivial merge